From: Axel Neumann <neumann@cgws.de>
Date: Sat, 17 Aug 2013 11:58:49 +0000 (+0200)
Subject: Merge branch 'bmx6_testing_new_config' into bmx6_testing
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=e61aebe3581d68eb3576e99d8237d5c180a68789;p=feed%2Frouting.git

Merge branch 'bmx6_testing_new_config' into bmx6_testing
---

e61aebe3581d68eb3576e99d8237d5c180a68789